projects / git-annex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4d9d6a5) | patch
try fixing windows test suite
authorJoey Hess <joeyh@joeyh.name>
Thu, 30 Jan 2025 20:31:49 +0000 (16:31 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 30 Jan 2025 20:31:49 +0000 (16:31 -0400)
commit4bf2e2c6967f9fdd9581046d85edd68b715c7391
tree3826a7e9dd0fd4d979080d12eca4a256a8f9cb34tree | snapshot
parent4d9d6a5bb57f06428527858c8da41a4c5dfb4d21commit | diff
try fixing windows test suite

Test suite is failing in windows in conflict resolution tests, where the
automatic conflict resolution adds in a .variant file. On windows, those
files are somehow missing. I don't understand why, and the test failures
only happen on appveyor and not in a local windows VM.

So, since replaceFile was recently changed to remove a windows specific
ifdef, put it back, to see if that is somehow causing these failures.
Annex/ReplaceFile.hs diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.